Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Jan 2011 04:30:57 +0000 (20:30 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Jan 2011 04:30:57 +0000 (20:30 -0800)
commit5e726b509cd63433d7ead9dc3e72e17103002302
tree0d5c91d57abe24b17b2559598a2e0f124c4df93e
parent06e68f8bb393b8bff00076e03e63d3bc2b5ddd15
parent3c77cc333d0c82d01c4330436de89a4a1ed41fad
Merge from mainline.